Skip to content

Merge a number of post process volume components into core so that URP and HDRP are more unified #7240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Draft
wants to merge 21 commits into
base: master
Choose a base branch
from
Draft

Merge a number of post process volume components into core so that URP and HDRP are more unified #7240

wants to merge 21 commits into from
+1,163 −1,917

Conversation

stramit
Copy link
Contributor

@stramit stramit commented Feb 22, 2022 •
edited
Loading

to be filled in later

Physical Camera Refactor PR needs to land first.

tim and others added 16 commits February 15, 2022 13:13
Physical Camera Refactor.
21a77a1
@stramit @alex-vazquez
Update com.unity.render-pipelines.core/Editor/Camera/CameraUI.Physica…
56b034b 
…lCamera.Drawers.cs

Co-authored-by: alex-vazquez <[email protected]>
@stramit @alex-vazquez
Update com.unity.render-pipelines.core/Editor/Camera/CameraUI.Physica…
88ac62a 
…lCamera.Drawers.cs

Co-authored-by: alex-vazquez <[email protected]>
@stramit @alex-vazquez
Update com.unity.render-pipelines.high-definition/Runtime/RenderPipel…
9dcddb1 
…ine/Camera/HDAdditionalCameraData.Migration.cs

Co-authored-by: alex-vazquez <[email protected]>
@stramit @alex-vazquez
Update com.unity.render-pipelines.high-definition/Runtime/RenderPipel…
6cf7ceb 
…ine/Camera/HDAdditionalCameraData.cs

Co-authored-by: alex-vazquez <[email protected]>
@stramit @alex-vazquez
Update com.unity.render-pipelines.high-definition/Runtime/RenderPipel…
bfe6c5d 
…ine/Camera/HDAdditionalCameraData.cs

Co-authored-by: alex-vazquez <[email protected]>
PR Feedback
18fa024
Update formatting to please formatting tool.
f8cb7ac
Begin unifying postfx settings.
bb0f1b4 
# Conflicts:
#	com.unity.render-pipelines.high-definition/Editor/PostProcessing/LiftGammaGainEditor.cs
#	com.unity.render-pipelines.high-definition/Editor/PostProcessing/ShadowsMidtonesHighlightsEditor.cs
#	com.unity.render-pipelines.high-definition/Editor/PostProcessing/TrackballUIDrawer.cs
#	com.unity.render-pipelines.universal/Editor/Overrides/FilmGrainEditor.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/ChannelMixer.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/FilmGrain.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/LiftGammaGain.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/PaniniProjection.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/ShadowsMidtonesHighlights.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/WhiteBalance.cs
#	com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs
Add Upgrader For PostProcessing components.
d61c3ca
Reset the defaults if an upgrade happens.
680f8e5
Porting more post FX to be shared.
a3e8286 
# Conflicts:
#	com.unity.render-pipelines.universal/Editor/Overrides/ColorCurvesEditor.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/ColorAdjustments.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/ColorCurves.cs
Tidy includes
85f10cd
Port Lens Distortion
cd20406 
# Conflicts:
#	com.unity.render-pipelines.universal/Runtime/Overrides/LensDistortion.cs
Unify split toning.
07ec61c 
# Conflicts:
#	com.unity.render-pipelines.universal/Runtime/Overrides/SplitToning.cs
Fix documentation links.
54ff404
@github-actions
Copy link

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://unity-ci.cds.internal.unity3d.com/project/902/
Search for your PR branch using the search bar at the top, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

HDRP
/jobDefinition/.yamato%2Fall-hdrp.yml%23PR_HDRP_trunk
With changes to HDRP packages, you should also run
/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk

URP
/jobDefinition/.yamato%252Fall-urp.yml%2523PR_URP_trunk
With changes to URP packages, you should also run
/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk

SRP Core
You could run ABV on your branch before merging your PR, but it will start A LOT of jobs. Please be responsible about it and run it only when you feel the PR is ready:
/jobDefinition/.yamato%252F_abv.yml%2523all_project_ci_trunk
Be aware that any modifications to the Core package impacts everyone in the Graphics repo so please discuss the PR with your lead.

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

tim added 5 commits February 22, 2022 13:32
Fix formatting.
3668b8c
Merge branch 'master' into tim/post-fx-refactor-foundation
45e153f 
# Conflicts:
#	com.unity.render-pipelines.universal/Runtime/Passes/PostProcessPass.cs
Port vignette with new editor type lookup.
a410948 
# Conflicts:
#	com.unity.render-pipelines.core/Editor/Volume/VolumeComponentEditor.cs
#	com.unity.render-pipelines.core/Editor/Volume/VolumeComponentListEditor.cs
#	com.unity.render-pipelines.high-definition/Runtime/Lighting/DiffusionProfileOverride.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/Bloom.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/ChromaticAberration.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/ColorLookup.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/DepthOfField.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/MotionBlur.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/Tonemapping.cs
#	com.unity.render-pipelines.universal/Runtime/Overrides/Vignette.cs
Do not break user created volume components.
e560bd9
Merge remote-tracking branch 'origin/master' into tim/post-fx-refacto…
46d3c3f 
…r-foundation
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@stramit